added further components