Logic rework in progress.