Redesign using caps not clips!