final commit. 1.4 and working code