added  further components