Added exp
Fixed merge