Scaling working
Animation
Conflict resolved