Conditional compilation seems correct now