Comparing #3506 (Version 1) and #3507 (Version 2)