more components added; need fixing