Merged Matt & Raj changes