Major rework on animation and filtering