Hijacktimefunc refactoring