minor refacro
Merge branch 'v2' into draghandle