Improvements based on recomendations.