New comments and parameters re-arrangement