Finalized first pass of version 2