changes from C1 branch