Made transitions a little smoother