Add reactive, fix tas