a huge change about scoring - almost done