Trying to make smoother transitions