Added ifdef