modified Tiles stuff to tie in better