Updated file - 3110 lines into David's file