Revert "Changes 006"

This reverts commit 6935cc0cbccd131c80e65c7f712bf7dfac6fec7c.
Changes 007