Optimize T7 handling by doing explicit transfers instead of using stage()