Work on #489. Multiple functions created