Manually added BlackCetha pull request changes