more changes on equipment management