experimienting with animations
fix merge conflict