Major rework done