Update with is_empty func