my changes after v1.2