Updates based on Jon Rowe review