Refactoring of the first version supporting tiles animation