branch remake_1.0.006