Updated to reflect server-side changes
Fixed slow status updates