added more components