Scripts rework