Merged Aaron & Phili. Corrected initial clashes.