Converted thesis to more general time-metric