final commit as of 24th