Added mechanisms for scoring