Updated with almost final analysis