commit with comments because of last changes to be able to rollback if
errors.