Add specs and normalization.