added Brian's stuff again