Include redheadedrod's latest changes