add CR changes and did some changes