tweaks
new shape