Add condiitonal to Remaming tr