Major rework done.