Tweaked animation to use requestAnimationFrame
Fixed merge