- reworked the base architecture