Uploaded changes from home 2nd november