simplify
Merge branch 'myvps'