@pp-mo Have all of these changes been made to this file by hand?