Re-work Time and remove Transition & Animation