added all paramters