Used shunting rule, first change to the original code, discard earlier commits on this subject
Used one point rule on 3.b