More development in my Chris Granger copy