made more changes to 1.2.4