Some changes after talking with Guy