revert to 2 function solution for add source + add calls for other entry points