Removed new code; that seems to be the problem