incorporating new feature requests and updates communicated to us in today's meeting