[DEV] rework some things ...