Change up some of the logic