U: update circles check
U: refactory