Added map gen, changed name