Demo updated with lib: working a bit.