Added scoring and timing