removed master_id