additional changes for debugging