updated defines