pre rework to single-world layout