Some changes in logic