Working on better map