Improved a little automodes