Titan time fix & refactor