Changed to conform to new map reading