update 1.2 - 19/4