working on autofill
merged?
added null check to refresh