Updates for checking ownership. Not passing tests.