updated og_world.*
- made a code refactoring