testing tweaks - still a work in progress