Update to include #2 updates