Changes to support next chapter work