added the changes by eric