mcooper add compatibility with sf; update to 2019