cycle mod
merge controller
cycle fix