Scripts improved