[feature12] a little bit changes