Adrian hack3

Merging into master.