Updated to new version. Demo should work better.