Changes with with Johns new file .

Please review.