Revert "Merged code"

This reverts commit df37865f2f8cf5c74a1ecf4e4b5f74ae95fb52ba.