reworked architecture