-Final pre-debugging attempt at 2.2.4