integrate deval changes
integrate deval changes