Changes to allow for pushing to be easier