little changes with the ifdef switches again