Implemented Suggestions

Implemented suggestions go here.