Updated code right before change to preprocessor