Bring in Scott's update