[DEV] rework (step 3)