last commit before rework
gloabl rework
rework done