Updated binary & macro defintion