added the rest of the descriptors