Comp Drawer extraction working now