added some extract stuff
added some extract stuff