more department_id modifications