Changed to run from master script
Changed to run from master script