Updated for observe queue