Added auto Q