drag and drop adjustments
refactor weight calculation