Changed Map generator code