Refactored tiles