Removed the HACK.. Removed the msg and puzzle counter