Added world checks