finish first pass at Release2