chang some constances and add comment