Fix logic.
Re-org.