4/17 Round 2 revised finished