Updated traffic light switching and handling