updated animations and function apply
conflict fix