Updates made long ago, commiting for historical reasons