working on world fix