Small changes for parameter evaluation