Added AutoFill and Double Check code