Implement 30sec lockout and fix cancellation
1 file changed