Alan

Merge in John's changes (af forgot to merge them and pull down beforehand)