Update to code to include forgotten changes