Some changes to Following