Updated with mroe details