some modification to ease debugging (for now)