some more fixes to extraction part3