amberhw1&2 done
Merge branch 'amberhw1and2'