Added scoring and proper serving restart