changes based on discussion/review with Wayne