Started making weight-checking changes.