Next phase 2 iteration; fixed animation bug