Last script improved