IW: A little house keeping on the main demo module