update: latest updates on development branch