some more redesign stuff