Redo UnknownShadow200's commits