OCSADV-23: Fixing estimate method to be more in line with P1 information.