Added scoring system and improved performance