Tile refactoring ready