Auto/Manual mode handled with less calls

Fixes #123