Scripts rework
Scripts rework