added the management part