New vader

Test merge of substantial changes from Elena