Some changes to WorldController