Full rework
Full rework done