Redid design a bit