Added Settings + Report final version draft 1