Org setup changed to reflect org update