More detail, reworked,