fix up design