working on autofill