Added square shape, and surface area normalization.