Add old upstream files
Import Strange's changes