Adding auto cycling support