20180611 Updated pipeline simplified