Reverted stuff from demo