More updates based on testing ...