Auto-complete small optimization

Binary also updated