I made some changes that should be pulled