#19 Resolving animation problems...