Reworked components