revision per Bobby/Derek comments