More updates from testing