Version2

Changes for future review.