preparation for demo
merged with alex