updated the management part