Changed some  componend replacement #7