Change extract temporary to a one step