some modifications for debugging