Added changes for All Users
updated script