improved at_cavity