Another attempt at getting this right