More progress on puzzle