Updated for reactive