removed class and changed scoring