Added #ifdefs