Many changes to allow for managers