Added feature7 and feature8
Revert "Added feature7 and feature8"

This reverts commit 6681dcb3188a9a593f31c372000eb989f0e62214.
Revert "Revert "Added feature7 and feature8""

This reverts commit 39934e08abb4e54d0b8c99e52bc35c3f495f3532.