Moved remaining changes across