WIP

moved transition, on fade in/out only