Many updates
fixed merge