(painfully) changed tree and user to reflect ownership