Adapted TC components based on suggestion by Tom Bewernick