Making demos work.