More tweaking of logic.