Rewrote extracting subsystem