comments and some parameters changed