Final changes in BW_preprocess.c