Apnea mode missing fields – stoper fields with lap counter – safety

There are missing fields / screen in Apnea mode.
Stoper screen with total time, current lap, previous lap and lap counter should be added to screen (lap counter is not dive counter).
This verry important for apnea training on open water and pools.
Depth trainings are performed in partner system, one is diving second one "buddy" is on the surface and is asist.
In next turn they switch their roles. At this moment buddy have to exit from apnea mode to start stoper or needs to have second watch / stoper to be able to control dive time of diver :(.
Time of dive is crucial information for safety od apnea diver.
Buddy need to know when to react when diver will not ascending on agreed time. It very important in low visibilty conditions.