refactored world pt 3/3