tube performance
merge fix