need changes on i==player