Updated to new Source exeution scheme