Updated with Vadim's comments.