updated 1.2