Adding Brian's Changes