Tobias' changes
Tobias' changes for demo