Updated for ownership transfer