little changes + 6_1 init