1 Add equipment list
Fix conflict
1 Fix register validation