remote test
bug fix 1
bug fix 2
Add more ux