pulled Commons.h into Benoit