added f and t support