change to owner table + controller for hash
fix conflicts