Polish on puzzle and take2