Redoing collections change to fix some errors