Added preprocessor conditionals..