animation refactor, injecting important dimensions