Update AutoAnswer code