First suggestions from Jim and Rolando
Removed test coverage from diff