added more defines