Added #ifdef to all changes so the code could be merged back