Registering scores on step 5.
Resolved merge conflicts in step 5.