Revert "Version 1"

This reverts commit 1886a3f606d67db039f7e8b808ca810abdb3b122.
Revert "Revert "Version 1""

This reverts commit e542512599bc15a36f71164651f6e6448a5955dd.
Fixed comments