Added Mike's Changes 4/15