FLOE-217: Revised math to match simulation