removed min/max macro's