more progress and poor git discipline