Improve for demo