Changes made to fix the Update issue.
View Events functionality working