Updated to included additional system statuses