Updated design a bit.