changed v1.2