experimenting with removing duplication
tweaks