merged latest updates