Modified code to include new timing files