add d now
Merge branch 'dev' into review1