Modify to Match MoveToFunction