profile updates
fixed merge