Shape animations with some bugs left