After suggestions from lars corrections.