Converted everything to generate world all at once