minor modifications for debugging