refactor code
fix dragging
remove forceUpdate