Previous cr comment changes verifed and add more cr comments