Smoothing transitions a bit still need more work