Removed currentDir since it has become unnecessary