changes made by Marc before branching