Version 2

Complete update to code.