changes to enable new functions from mergeroad branch