Final commenting improved