updated for latest merge of glasshouse pipeline. May still need more debugging