adrian changes 2
Merged branch adrian commit 2