Added logic for 32 points