Change to new update functionality