Implemented Owen's suggestions
Implemented Owen's suggestions