BIT-23 enough code to get the demo working