Final-2

Changes to final code.