added SUB and the rest of CB... yeah...