Catch up to private version