added color and updating of events