update logic and rm some limit