Fixed new changes for Points calculation and checked in