Full source commit with minor input/output path modifications