Framework part reworked