changes after the demo
commited after emerge