updated to 1.2