added exp
fixed merge conflict