Updated with figures