Adding all current modifications. Now I'm on-track.