still fixing auto-complete