Modified strat and domain methods
Moved weighting calculation from domain to strat method