changed some of the prototypes for namespace problems