done body-weight refactor