World fix

**WIP**