Fully reworked