Revert "Revert "Added additional changes""

This reverts commit 35c99018063a9088c002d19ee78667bcee88b814.