Adding 'auto' mode