Made some changes to puzzle