merge for latest updates