3rd update
fixed merge conflicts