Surface oriented diving

Summary