[VP, TP] Clock refactored