Final updates by Dan