Few changes on scripts