World constructor changed