- better animation handling