Added some changes to preprocessor again