some changes on scripts