Finalized revision of v0.1