\cc @tiffanie @kirstenabma
Based on discussion with Sytse; this should make things faster and smoother.