Noel's changes