Changes after suggestions from Jan