switch up design per discussion