tweaks to structure