Revert "Modifications 7"

This reverts commit a144ef9189574ffbd76906913bc698610be39c31.