Update to work on c9