added optional base path changes