Final commit as of 05.08