Components: review, update