Changes according Daniels recommendations.