Revert "Updating code to latest version"

This reverts commit 92c6c183b1352068b06d47d00b0313f7d7f74f0d.