Update to work on C9