Added Eric's stuff back in

There was a conflict