ready for the new functions from the mergeroad branch