instant -> animate
refactoring/simplifying code