made improvements to 1.2.4