switch up design per discussion
switch up design per discussion