[fixes]
- adding the various changes for the rework