Changed up the transitions implementation