Refactor to use Window Distance for utility calculations