remove conditionals and add tr method