Improve demo and use a better fill method.