capturing @rjmajma's changes in a smaller PR, inside 18F