merge mathav's changes
color:red update event - separate controller