FW: Recents improvements