untested changes; active player