working on remote integration
fixed merge conflicts