Decided to simplify logic at this stage, will work first of points setting mechanism.