Updated script and yml