Worked on improving context update rules