replaced scoring system

and deleted old system