Better owner logic
Better owner logic