Design changes

Tweaks from Damon