updated script and all