added hints
Merge branch 'duncan'