Switched up some things