Update for Vadim Demo