Import v1.2 code