add jeff's changes