Made changes optional with ifdef