add remote workspace
few modifications