Trying to make it smoother