reworked mod again