Latest changes after testing driver