Restructured and reworked