Few scripts modifications