Demo and features commit