Modifying transitions for easier callback