[DEV] base rework