Updating stuff for pipeline, so that it hopefully runs faster