pulling for presentation
fixed merge conflicts