[VP, TP] layout refactored