Small changes after discussion JT + AJ