Bicg Needs to be fixed.Returns NaN
Fixed conflicts on master