updated 1.2 version