fixed shannon's cruft