more compatible version of previous pull