a lot of changes some pointless