Made some changes to scripts