Adding toggleDoWarp etc