Details / reworked design