Refactored and added more tiles