Added in auto cycling