generic.h some function protoypes changed