Cleaned up BC's, better normalization