Version 2 of puzzle