port @kedashoe and @kevinbeaty changes