Readded that bit for a demo