Suggestions implemented.