Revert "Revert "Revision 2""

This reverts commit 3565ea08a26125a71be6c62fc12f2945832d0150.