added world back with correct(?) lifetimes