WIP Fixed performance problem

Fixed score