Still ok, logic gettin better