switched out custom logic with repeated calls to