Rebasing updated function to main branch

[andrewbaxter439]

@vkhodygo - is this suitable to rebase onto the master branch? this branch can be left open for further development