BUG FIXED + SCORE