Pile of commits for paper 2