update for Collection2 changes and overall style and flow changes