Integrate all changes up until now