See my last suggestions.