Updated extract code.