Added custom anim + refactored a little