rename + almost done with ch-01