more defines added