Handle animations better.