Better world handling