Merged Brian's updates