snapshot of changes from Cyrill