fixing the transitions