Extract to correct location