Also integrate terms suggested by xorbyte