old update
fixed merge