Made some fixes to change mark to player