refactor and new tiles