Reworked tiles again