done upgrading to 2.1. end-to-end works