First modifications, still need to remove some hardcoded paths.