FW: Final recents commits - WIP