From what I understand, both Mr Shaw and Mr Dreyer were found beneath the surface after having come free from whatever was keeping them at the bottom.
Police were reportedly considering to attempt recovery, but then they were found while the dive equipment was being removed from the cave.
The West Australian ran an article today, but it doesn't seem to be in their online version.
I am sure someone on here will know if Mr Shaw was ex-AN. I recall there was a website that listed some ex employees, but I don't think it is online any longer.
Sky