1st draft
new changes