Adds latest updates
Tests working