Logic improved.