made tweaks to structure