Added ifdef statemetns and printf's for raw data.