Auto-scaling done the way it should be