Selective equations evaluation
Merge branch 'parse_conf' into quantum