A quick edit where I focused mainly on transitions
6