reworked somehow