-some rejiggering