Seperate scores competly!

Now also works with hscore!