Updated based on new parameters in the library