WorldController refactored more