Suggestions by Rick addressed.