Replaced values with variables
Working on map generation