Changed defines and printf statement