latest updates ready for testing