Adding in Brian's Changes