Added clicking to optimization stages