refactoring - due to upstream PR
update due to upstream review