attempts to leave prototype alone
update test
fix merge conflict