get rid of hi2, add auto-complete