Updated to work after extraction.