adding Joe's changes