Ashley: Merged code changes from Jason and Ajeeta