All done missing improvements