added exponent
fixed merge