Check if we could do the if and else's in the puller more efficient.