added component hack