More surgery; trying to make this really simple