Added some changes that should have been in the last commit