vadim's proposal and other changes