Moved more functions to new version