revised the code that determines if t or x are present and moved it to a dedicated method
revised the code that determines if t or x are present and moved it to a dedicated method

jgte/orb,jgte/orb,jgte/orb,jgte/orb,jgte/orb