added jeff's changes