few more changes to V2.1 before we send it to test