some edits for use at OKL