merging summer branch and closing