#define errors resolved