Synchronous

Moving the synchro branch back to master