Revert "Revert "Made some changes""

This reverts commit aec3cf4b4c0da66b6dffeee1d7d4d96cce6d9ba8.