added keepdemo option