Updated fetch script