Modification

1. Using mixin to control animation