Definitions reviced