Update Sandy to new code