new make build
merged James's weight -1 fix