First commit of old modification of original code.