updating for normalization options
fixing conflicts;