Little modifications to script