Additional correction. Some needed to be explained at demo.