improved at_cavity#2