Switched to a new ref/input structure