added auto fill only mode