Change animation approach - Close #11