Cleaner optim
Removing giveup button
Changing substitute system to allow user to disable it