Edited lines 351 and 357 to add #if 0.. #endif