updated cib.h addressing @authmillenon's comments