Shaping up some demos