Tiles fix, initial draft