Improve for resize behavior
Improve completion behavior