merged latest changes