Small Additions for Demo