Changed user to player handling