Bringing in changes from Vadim.