Switched certain things around