stop using currentTransition != null for transition check, instead I use inTransition