final version now with animations