Revert "Function update"

This reverts commit 7953eaf1a32a4988d639b90b321aaadf6ebaf3a5.