Did a lot of work on the modification system