Cristian: update on Foundation