tweaks
changing structure