Merged in editing start from yesterday (alex-3)