Added transitions for a smoother feel