Reverted buggy buffer creation changes.
Extended the CubeDemo class.