Made changes to get the whole pipeline worknig
Tentatively working more testing required