Rewrote updateStatus with waterfall