removed hardcoding in Script paramaters