started working on new score function
fixed merge issues