Make this transition nicer