Make both source methods identical in both scripts