Doing some improves with Owen's suggestions