my really final commit wit part2