Switched around a few things