use new code in demo project