added brian's changes