Changed the Defines and added inits

added inits