types.h modified (th 3rd time)