Changes for inter-script compatability