pipeline fixes, not working yet