extend safe checks and checks from TT