verify Updated the comments and added entity escap