Moving things around to make pip play along