Added animation-friendly code