cureButton added
merge fix
merge fix
cleanup case
merge fix