update by vichet to support foundation