changed hard coded values to macro values