More updates for debuging