Did a bunch of stuff on modify existing code