update to implement Christos modifications