adding jeff's changes