Updated to match new parameters and features

Updated to match new parameters and features