Updated to use new script