ACF and other updates