changed neutral logic a little