= Normalization & design improvements =