Some changes from the pi