[DEV] rework the internal arch eneded (not work)