modifications for Z TT and fakerate