Added checks for variable scores