Correct masking and player tracking