Suggestions

Any suggestions to be added in the next patch