Final commit with all the changes according to our network