Include Riyad Preukschas suggestions.