trying ti improve more of the logicy
m