Round 2 cleaned and expanded