Nevermind, putting all changes back into one file