Added absolute paths, changed code back to non-inline