Sarah added command line, Andy's weighting