Add guess factor calculation for waves